From cdd1e5d112706b354e5d86d349f07f22b8767ad6 Mon Sep 17 00:00:00 2001 From: Martin Nordholts Date: Wed, 25 Mar 2009 19:02:39 +0000 Subject: [PATCH] NULL-statements caused by trailing commas are non-portable Patch from Gary V. Vaughan svn path=/trunk/; revision=401 --- ChangeLog | 10 ++++++++++ babl/base/type-u16.c | 2 +- babl/base/type-u32.c | 2 +- babl/base/type-u8.c | 6 +++--- extensions/CIE-Lab.c | 8 ++++---- 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index b8d3840..318c32b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2009-03-25 Martin Nordholts + + Patch from Gary V. Vaughan. NULL-statements caused by trailing + commas are non-portable. + + * babl/base/type-u16.c + * babl/base/type-u32.c + * babl/base/type-u8.c + * extensions/CIE-Lab.c + 2009-03-25 Martin Nordholts Apply patch from Gary V. Vaughan that adds configure time checks diff --git a/babl/base/type-u16.c b/babl/base/type-u16.c index c09fe0f..9fcad8b 100644 --- a/babl/base/type-u16.c +++ b/babl/base/type-u16.c @@ -108,7 +108,7 @@ convert_u16_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX); +MAKE_CONVERSIONS (u16, 0.0, 1.0, 0, UINT16_MAX) void babl_base_type_u16 (void) diff --git a/babl/base/type-u32.c b/babl/base/type-u32.c index aa168d1..fc38a01 100644 --- a/babl/base/type-u32.c +++ b/babl/base/type-u32.c @@ -107,7 +107,7 @@ convert_u32_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX); +MAKE_CONVERSIONS (u32, 0.0, 1.0, 0, UINT32_MAX) void babl_base_type_u32 (void) diff --git a/babl/base/type-u8.c b/babl/base/type-u8.c index 66b6412..9a67a0e 100644 --- a/babl/base/type-u8.c +++ b/babl/base/type-u8.c @@ -108,9 +108,9 @@ convert_u8_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX); -MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235); -MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240); +MAKE_CONVERSIONS (u8, 0.0, 1.0, 0x00, UINT8_MAX) +MAKE_CONVERSIONS (u8_luma, 0.0, 1.0, 16, 235) +MAKE_CONVERSIONS (u8_chroma, 0.0, 1.0, 16, 240) void babl_base_type_u8 (void) diff --git a/extensions/CIE-Lab.c b/extensions/CIE-Lab.c index c4b4a52..855d716 100644 --- a/extensions/CIE-Lab.c +++ b/extensions/CIE-Lab.c @@ -395,8 +395,8 @@ convert_u8_double_scaled (double min_val, /* source ICC.1:2004-10 */ -MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff); -MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff); +MAKE_CONVERSIONS (u8_l, 0.0, 100.0, 0x00, 0xff) +MAKE_CONVERSIONS (u8_ab, -128.0, 127.0, 0x00, 0xff) #undef MAKE_CONVERSIONS @@ -532,8 +532,8 @@ convert_u16_double_scaled (double min_val, src, dst, src_pitch, dst_pitch, n); \ } -MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff); -MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff); +MAKE_CONVERSIONS (u16_l, 0.0, 100.0, 0x00, 0xffff) +MAKE_CONVERSIONS (u16_ab, -128.0, 127.0, 0x00, 0xffff) #undef MAKE_CONVERSIONS -- 2.30.2